unfocussed hacky additions