Patch 1

Fix and translate