Made some handsome changes