FIX: Making old and new options better