reshuffled things and added licences