Add Martin's codes