restructured a little