Included set of changes