first attempt to remove CMG dependency
first attemp to remove cmg dependency