Final commit after finishing for Celtra (next time we continue will be for a paper)