added check for format string
upped version