first attempt at ESC support