changes from break and cli controller