Updated layering, works now