Added template. Changed calls.