I'll prepare v8 with all the previously discussed changes so that we can continue the discussion there :)