merged gumby 2.5