still issues with just if, using unless from previous commit