Adapted case study to new functions