Added proper return statements