Shortcut  zx added and removed some unused