Better interpolation of commands