little changes and testing