oh actually that could be improved!