New update system.. still may have issues