Marking (done) stuff for ETV
Adding Tooltip review