adjusted for comm stack modifications