changed some things that I made wrong way.