More improvements on 2