Successful init
Some more changes