Final Update for Build 2