1 less time check
merged ab conflict after function moving