more functional rubbish :)
Minor tweaking