Will this come with the option to choose top type this time, or will it still come with both? I wanted to join the first GB, but with the cost (because of coming with an extra top piece that I was never going to use) I couldn't justify the purchase. Otherwise, these look really great Kiko!