Updated to version 7