Removing a few options and adding others