Improving stuff
Bug fix