some small changes to integrate translations