commit updates
Manual merge with Miguel