todo task for gci and bug fix