Added Endium stuff