Added zOffset back in. Closes #574 and #556