CGE2: Smaller revision regarding Spare.
CGE2: Use locate() instead of take() where possible.