reuse the variables
critical bug fixed, revision number shouldn't change now