Updating classes at sarken's request