Finished version 1.5