Finished extended version