Addressed Alex' shape comment