Trying to make the whole thing more responsive