reorganize some of the new skip code for scripts