Small adjustments, but not quite there yet