Made some changes to make implementing easier.