changed serveral things