Fixed up classes