Changes By Tomek Zakrzewski