incorporated all code into one file