Final changes to code and added Report