Update to latest developments