Update errors
Add @cmr's implementation