+ further changes