Added comments and DoD