Finished version for 1.8.0.1