finalised ver1.3