A bit of work on multipart