Final changes without pictures yet.