Change after tarek review