Image updates and code consolidation.