fix
more tuning