Change to tested up to 4.0