Changes for packaging