renaming 'pour' variables and adding unless