updating analyses, should have all three ways now