completed changes required to introduce grouped policy based windowing.