Updated skip check and other related views