return statements added to handlers