some improvement on 1.3