localisation improvements