Revert "Commit3"

This reverts commit 3e64b30c329da0478b0f7d257186ee29e3205b24.
Revert "Commit2"

This reverts commit de8caa5b48f3e45aeb10097976cf6d68d603ab9f.
XPath expressions updated