more save gate WIP