Updated to reflect the new options