added conditions from mr fernando