Udpate 1.5 and fix 1.4