Update: few tweaks