Updated version, changed timeout