fixed some positions of code!!!