removed too much outcomment of code