Features in issue 2497