Slight restructing.