Making gcb a little smarter