further changes and test