some additions/changes