Implemented Richard's Id3 improvments