Made some changes :)