- small changes are dumped before major paradigm shift (to be implemented in next commit)