Replaced "quit" with "return"