some adjustments for our setup