Adress Issue 10, not quite happy with the result though.