Modified according new dll