move away from separate boolean variables