Slight reorganization: customizations into outline form