remerge john's changes