updated to a 32 span template