More work on defer