permissions better, adjustments still required