last version, mesages fixed