Mariachi Vargas - Cell Mates chords

First tab, so go easy. Awesome song, obviously the rich and incredible version by el 
is with the whole mariachi ensemble - here are the chords basically transcribed for a nice 
version..

Standard tuning.

INTRO
G G C-D-G x2

          G
In my defence
               G
These prison walls
                C      D            G
They couldn't hold anything in at all
             G
I see your face
              G
In all the walls
               C        D         C   D
They had me crawling on back to you

CHORUS

G     D    Am       Em      D
Honestly, will you wait for me?
  C       D     G       D
A little word, promise me
Am      Em       D
One day I'll be free

G G C-D-G x2

VERSE 2
[ Tab from: http://www.guitaretab.com/m/mariachi-vargas/248023.html ]
             G
This kinda place
               G
It brings you down
           C               D           G
Everyone's dragging their feet on the ground
            G
Your kinda face
              G
Could save a soul
             C         D      C     D
It keeps me crying on out to you

CHORUS

G      D   Am      Em       D
Honestly, will you wait for me?
C        D     G       D
A little word, promise me
Am      Em      D
One day I'll be free

Middle 8
G G
D D
C D

CHORUS
G      D   Am      Em        D
Honestly, will you wait for me?
  C      D     G       D
A little word, promise me
Am       Em     D
One day I'll be free

ENDING
D
I'll be free
D
I'll be free
           G
I'll be free
            C         D        G
I keep on crawling on back to you