Attempted merge. Hopefully particle effect issue is resolved