More work, mostly on application