changed && to and