updates from sprint 8