fixes from ver2