proc reorganisation and updates