Missing return statements added.