Can we add an argument to this function, so that this can be switched back to false if necessary?