New OOP Stuff, Redraw improved