Class Dragon some Updates