merging updates from sprint 2