#9, close #8, close #5,#2 fix for location