comment out previous work and add logical operators