Incorporate feedback from Sander's review