improve location
last commit before further development