More work on CPU