more work towards new architecture