Updated controller for compatibility with newer okoa bundle