commented out checkId which was a pain in the ass