ENH: Better Pulse use