Improve data passing per @tmeasday suggestion