Y-axis & performance improvements