added a few returns