commit on the refact_honey_2 branch