Updated a bit again variables and values