changes in pack primary phases mostly
fixing merge issue
small changes