Added checks for plural. Don't say I'm not efficent ;-)