Updated translation, cleaner separation from base