new generated code and a slight chane to the place where I work