Update to work on latest version of akira