Fully adapted HW1 to new API