Improve gi/gp/yi based on feedback from alrra