moved command call around.