small tweaks to make this even smoother