improved temlate again