refactoring
working on targets and translations