Forgot to replace the raw values by variables + update