less variables and upgrade