[3643] update and create tweaks