updated for new UI changes etc