New update

90% complete