some changes to work with last version of worona