Refactor multipart - try 2