Updated with Oct Free Class