Made skipping logic more obvious