Fully updated and working again