changed some code que