Up Date_1.2

ALOT OF CHANGES