updates to usage and flow