Added collision fixes (commented out)