too much changes
container commands are now reflected too