WIP: activating code for using OIS