More options are now working