Final commit for Beta Build 1