and even spiffier if i put the data where it belongs