updated branch for ed's dev tree