last commit before thesis - fixed a little bug