Reintroduced while loop so that we still wait 15 seconds even if we are interrupted