few additions/changes