I'd like to wait for the final design before making this change.