shelving changes, caught up to wave 7