@karlnapf based on the discussion with @sonney2k at irc I currently changed it back to the old one for now. I will work on handling it a cleaner way as he suggested and change it back when that's done!