#18 Add envelope curves