more work on new architecture