some further changes