Forgot to commit added return statements