Add Offset option and fix