Made small tweaks to adjust to driving changes