add some stuff from magnars