seem to have fixed important things