handlestore modfified