New version
fixes