changing return to handle all from return