Rework to use utility functions