following dmd 2.065 and separate files