updating vars
updates
trying to make it cleaner