couple of further changes