updated version, fixed limit and skip