Location is ok , but expect it to be cleaner