Import of Version 4.0.4