Now more responsive, thanks to Alexis magic