DIYMaster_Ref-Second partial commit