started adding skip logic