Final addition for this class...