minor change to support new features