adjusted some stuff to see if it helps fix the issues