First init
small changes in structure