Feature/now 195

move vars here also