had a mistake on lines where there need to be &&.