Fixed the Classes