Final changes inc. image replacement