Is this necessary or can we address style changes separate to this issue?