Added some preparartion