Ok (rework)

Ok (rework)