Moved both options to master