Updated to fubu 1.0/