Removed the hard coded state