Improve initial template