updated to match the template