2nd part of work

2nd part of work