oops - missed two files from prev commit