Some final changes - hopefully - to prepare for afternoon session with better integration.