Now done as a wrapper script, added --skip option