Update with more varibales and a better starting structure