small changes in users and order