latest changes to make it more story like