updating to new architecture