OFFICIAL UPDATED SOURCE CODE