more modified fixes