this's way better.

just have to make sure I'm not really duplicating anything