Some further changes