Updated structure and stop-points