[@Punished GN] done!  Let me know if any more needs trimmed