added form skip logic