updated to class-based helper