Way halt mechanism added