More work on inspect