format security and add some stuff