No longer uses xpath's, so this should cause less problems