Martin's changes