upgraded to use noblackmagic template