Some tweaks are needed / polish HW a bit

Printable View