Are we going to address this before merging?