finalize changes 7.18 done gtfo