Rectangle and Ellipse now in extra thread