Made some changes

Committed on 12:03 AM Thursday