removed special support for "initial"