Think I can get rid of this method by now …