made message less sucky
updated version to blaj
tidy up to reuse extension method