Update

New update still have issues with error