moved oath observer to an other class