+ a few changes + refactor