added && to condtion