Added noimages option