Tested final code

Tested final code