[MOD] Worked on the layering.