Made some changes here.....