Bug 917

Resubmitting after fixing cleanup suggestions