Sorted out some offset ordering issues