CodeSet improved