Fixing Jahid submission.

Changing return type and updaiting when not neccessary