major changes incl. permissions