ID16 improvement and fixing