fixed up some more for first class