Merging Dennis' changes