Made some changes as example