Got rid of r.rectangle (could be reverted later, if desired)