Added support for current image rather than normal