Add code from Pelican Lake