Converting everything to the new system