adding variables for the rest and some tuning