took back fixes - pushed a bit rushy