final changes (for now)