More work on WG scroll