Updated to omnibus 4