remove periodical saving
make insert a function and not a makro
added static to signatures