Try and fix some problems with costs