Changes for release part 1