more updates and testing