Made the operations configurable, messed around more.