Better order and logging