Repaired clone
Added template import
Added template import