Too slow improvements