DANDY-474 - Part 2