Updated to work with GriefPreventionTNG