Imported version 0.7