MISC - refactor and new features