FIX: addressing Alex's comments