Adapt GAPPS for a more filled pack and change ace finalizing