Adding further changes