more changes and testing