Updated order and removed focus