Reverted version 7.