Modified for better presentation of options