Options functionality working again