merge in Noels changes