Updated: finished image management