HW7 V2 (merged from Pinji branch)