Changed to blade tempaltes