FIX: Addressing Alex + Eric's comments