Jody's changes