updated to match our setup