Made some changes ;-)