Switched over to tikz