improved g todo