re-added some additions