assignment 7 improvements
assignment 7 improvements