Inter G-switch in progress
Fixing merge