many changes with less files and variables