fixing first-layer issues