adapte to 4.0