- improvements in delegate structure