Working on #251 - Replace hardcoded text ...