Added cake and whirl scafholds