reorganizing and doing sanity runs