initial structure
more changes