#9 - Minor changes