Consistency updates and use of global vars