More modifications in develop branch