Some big changes by following up the previous change.