Get rid of rectangle, new behaviour