modified for use with image-manager
minor clean