added 17 new lines of code