conditions added for skip and take