more updates/testing