tweaked timing and classes