Added tragically missing returns