Changed the scalars to use the new architecture