Added hashes for checking if element exists. Commiting so I have the change but will eventually revert back.
save before revert