cross removed
templates updated