Build 2

Test Build 2:
Fixes bugs from Build 1
Better Performance