Seems to now mostly work