Add better parting functionality