Updated sources (w/ fixed sound)