code changes based on story 746