Changes to handle big images