I think you're right. Do you think I should remove this change and revert it back to the mutable stuff?