Merged with Martin's files