Fix up all code to be best version