More work on requirements