Improving goose and making adjustments to apis