Use offsets in the loop logic instead

Use offsets in the loop logic instead #249