Switch to @krye's current system