some changes that might play better in MT usage