some things had to be adapted