Added save img. Clean up