minor fine tuning