Updated to match the template