proper includes
new structure
minor