Final Changes

v1.1