Recent code from Becca and Essam