Made some additions