Oulet refactored