whoopsie
showing current data
updates
fix merge