ver 1.3 update the right code