handle cups

Fixed my inbox, should be ready