DVDMS-560 - Part 2