Final Changes for version 2.0.....?