Update to resolve issues