Revert a bit, research proceed