Added all kinds of changes :)