Changed back some code