More work done on Report