updated with latest D models