todo task for gci and bug fix

Got it. I am on the way to fix that :+1: