Quick rewrite of helper, needs finishing at work