adding some changes
cleaning up