Master upgrade and version encapsulated and working