final touches before implementing v3.0.5