This one seemed to work as written, but I decided to just remove the conditions anyway so it's always an option.
