commits
added and rearragned