fixed collision again...
still fixing..