Complete request 21,22,23,24

Completed the request 21, 22, 23, 24