This is my updated version.