minor change of structure