Add version 7 for debugging