Major Update

FIX: Range