Update for latest incoming (4a52ff0)