Added 'And' step and some Xpath