Check out the amended code