markwheeler update to match Timber beta 7