Changed shutdown and sleep to return