Added post processing & skip logic