Changed scaffolding and stuff