fixing the skipping rules, should work now