revomed some lines of code