Mostly planning and a bit of reorganization (no more multiple types of pin).