reorganisation and additional stuff