Update Sand Trap to 2.0