I definitely think you should add the bi-xenon/LED lights to the build. I didn't have them on my CLA and was a must have when I upgraded to the GLA (which the Edition 1 has.) You won't be sorry. I'd add the pano roof if you can afford it. I never thought I needed a sunroof, but the pano on the GLA is different from an ordinary sunroof.