added separate key-blocks