just need to add suffix stripping