Added final version of code