Refactor OVER

Now compiling