Implemented Smart Skip. Resolved #27