Some more tweaking to the initial structure