final update, drawing fixed