temporarily removing dpendency on entelect lib.