Import of Version 1.1.7