Updated to address initial problems.