Fixed some of the hard coded data