fixes?
still trying to fix