Integrating latest changes with Boris initiation