Code Changes for .1 Beta