More work on away mode writing