Included all with final version