Added collision handling + demo