removed dependency on general templates after restructuring