Finished version 1.3