refaktor, finish securit handlerov