added skip logic