safety class is now working