[Hde2] Box picutres updates and some preparation for future use