Added simple collision handling