More work on the initial version