2x speed improvement (xpath is slow..)