upgraded model translations + testing