Opps I

missed to made some other changes. NOW it is final :P