Move around the skip logic