Adapted

Adapted GMN Hatch 1707753600000