adjusted for Pelican 3.5