Started to modify the scalffolding