last commit before thesis deadline ;)