Updates

Copy of the PR I sent you by mistake