before update to issue1 version