Add back code for intermediate review