Remerge francis' stuff