xpath stuff added