Handle DSQ penalty and related refactors