More work towards inventory windows