Minor changes, warsaw and shit