improved where scheme is updated