some adjustments from prev commits