New Update, mostly working