Made further changes