glitches to be fixed