timeout changed + more stuff coded into run program