Fixed change cost bug
Merged changes