small changed in the order of calls