More work on prototype