Still things to be fixed