Our latest chages after the makefie near disaster