Fixing HW-02 commit