First version after completion of project by Dan