Updated for latest developments