diff --git a/init.lua b/init.lua
index 5515e51..9f159f5 100644
--- a/init.lua
+++ b/init.lua
@@ -1,72 +1,75 @@
-local thrower
-minetest.register_on_mods_loaded(function()
-minetest.override_item("default:snow", {
-	on_use = function(itemstack, user, pointed_thing)
-			if not minetest.check_player_privs(user:get_player_name(), {creative = true}) then itemstack:take_item()
-		end
-		local pos = user:get_pos()
-		local dir = user:get_look_dir()
-		local yaw = user:get_look_horizontal()
-		if pos and dir then
-			pos.y = pos.y + 1.5
-			local obj = minetest.add_entity(pos, "snowball:ball")
-			if obj then
-				obj:set_velocity({x=dir.x * 20, y=dir.y * 20, z=dir.z * 20})
-				obj:set_acceleration({x=dir.x * -3, y=-10, z=dir.z * -3})
-				obj:set_yaw(yaw)
-				thrower = user
+core.register_on_mods_loaded(function()
+	core.override_item("default:snow", {
+		on_use = function(itemstack, user, pointed_thing)
+			local name = user:get_player_name()
+			if not name then return end
+			if not core.check_player_privs(name, {creative = true}) then
+				itemstack:take_item()
 			end
-		end
-		return itemstack
-	end,
-})
+			local pos = user:get_pos()
+			local dir = user:get_look_dir()
+			local yaw = user:get_look_horizontal()
+			if pos and dir then
+				pos.y = pos.y + 1.5
+				local obj = core.add_entity(pos, "snowball:snowball", name)
+				if obj then
+					obj:set_velocity({x=dir.x * 20, y=dir.y * 20, z=dir.z * 20})
+					obj:set_acceleration({x=dir.x * -3, y=-10, z=dir.z * -3})
+					obj:set_yaw(yaw)
+				end
+			end
+			return itemstack
+	end})
 end)
-local SNOWBALL = {
-	physical = false,
+local snowball = {
+	physical = true,
 	timer = 0,
 	visual = "sprite",
 	visual_size = {x=0.5, y=0.5,},
 	textures = {'default_snowball.png'},
-	lastpos= {},
-	pointable = false,
 	collisionbox = {-0.25,-0.25,-0.25,0.25,0.25,0.25},
-	selectionbox = {-0.25,-0.25,-0.25,0.25,0.25,0.25},
+	pointable = false,
 	collide_with_objects = false,
 }
-SNOWBALL.on_step = function(self, dtime)
+
+snowball.on_activate = function(self, staticdata)
+	local thrower = core.get_player_by_name(staticdata)
+	if thrower then
+		self["thrower"] = thrower
+	end
+end
+
+snowball.on_step = function(self, dtime, moveresult)
 	self.timer = self.timer + dtime
 	local pos = self.object:get_pos()
 	local yaw = self.object:get_yaw()
-	local node = minetest.get_node(pos)
 
 	if self.timer > 0.2 then
-		local objs = minetest.get_objects_inside_radius({x = pos.x, y = pos.y-1, z = pos.z}, 1)
+		local objs = core.get_objects_inside_radius({x = pos.x, y = pos.y-1, z = pos.z}, 1)
 		for k, obj in pairs(objs) do
 		if not obj then goto nodes end
 		local prop = obj:get_properties()
 		if not prop then goto nodes end
-			if obj:is_player() or prop.collide_with_objects then
+			if obj:is_player() or prop.collide_with_objects == true then
+				local thrower = self["thrower"] or self.object
 				obj:punch(thrower, 1.0, {
 					full_punch_interval = 1.0,
 					damage_groups= {fleshy = 1},
 				}, nil)
-				minetest.sound_play("default_dig_cracky", {pos = self.lastpos, gain = 0.8})
+				core.sound_play("default_dig_cracky", {pos = pos, gain = 0.8})
 				self.object:remove()
 			end
 		end
 	end
 ::nodes::
-	if self.lastpos.x ~= nil then
-		if minetest.registered_nodes[node.name].walkable and node.name ~= "default:snow" then
-			if not minetest.is_protected(self.lastpos,"") then
-				minetest.add_node(self.lastpos, {name="default:snow",param2=0})
-				minetest.check_for_falling(self.lastpos)
-			end
-			minetest.sound_play("default_dig_cracky", {pos = self.lastpos, gain = 0.8})
-			self.object:remove()
+	if moveresult.collides then
+		if not core.is_protected(pos,"") then
+			core.add_node(pos, {name="default:snow",param2=0})
+			core.check_for_falling(pos)
 		end
+		core.sound_play("default_dig_cracky", {pos = self.lastpos, gain = 0.8})
+		self.object:remove()
 	end
-	self.lastpos= {x = pos.x, y = pos.y, z = pos.z}
 end
 
-minetest.register_entity("snowball:ball", SNOWBALL)
+core.register_entity("snowball:snowball", snowball)