More slight restructing