fixed time issue & limit data set