Update for special cases