Updated version for Mantle