edited to reflect current DTOs