tidied up with lib-locations