Fixing gtc init
Fixing merge conflict