Tango Class Updates