changed to work with universal template