Huge rework and authority changes