Updated sources and I'm not sure if they all work.