improvements from capacity test