MArtin changes