More improvements!