Added all kinds of code