Version 3 done (submission version)