Final set of changes