Updated version, minor changes