Added x3 classes to the ISL
Cleaned up code