many aegis specific changes