tweaked partitioning, moved logging