:pig2: gravity and :pig2: refactored