Import of Version 3.0.4