Scafolding Improvements