abi changes

changes as per abi.  Didn't touch the flash messages :)