Added some return statemets
Everything works. Test successful