Probably we dont need this as well following new visuals