Changes for presentation
New version passed all tests