Adding all stuff for the 0.1