Further work on away mode