minor changes after smartphone test