Update & Fix glitch