Saved changes to be merged with dev_1.0