revamping stories a bit