Made star class working