Slight restructure.