Updated for Sclera 2.1