HW 6-1-2

Both tickets in one
Revert "HW 6-1-2"

This reverts commit 3e4dddc44e648e74581bbae6a3ea6f8b710d8b3e.