fixed broken  and old class