initial modifications after GitHub autogen