Version 6.0.1 (more additions)