some trivial modifictions