Made data passing less jank