Re-did initial template