More work on notify and pickup