better support for new images