Made some updates and changes