Requested Changes implemented