Almost done transistion to new architecture