Final commit before closing, this topic will be continued at a later point