Final Changes for version 1.2