commit for 0505
committing w/ some changes