Re-enabled Buildings and Picking