UPDATED options to be consistant