More skip checks until I can figure out how to detect