Made some updates