updated to offset and limit
updated to offset and limit