new versions and fixed