Try new (untested) helper class.