Added 12E1 and solved some issues