merge with Thomas' final
merge