Adding a better scaffold