UnitGroup added and some other chanhes