Modified to match template