Fixing the gaps | PuckGM