moving some methods to use procs instead of the long way