Feature/lessvars