updated with new options