some tweaks after trying with different languages