Added some hard-coded controls