accomondated new spec
..