Modified assignment 15