some changes from milan
quick typo fix by stu