Started using Yngvi's code, and it works, so far
Resolved a conflict