added condition statement check to dev version.