major work on 4.0 - 4.3