experimental changes to beautify after