some restructuring
some restructuring - next
Example updates