final changes for this class