added more changes (yes i dont remember what i have done last night)